Merge commit 'upstream/3.11.0' into 3.11/master
authorStephane Glondu <steph@glondu.net>
Thu, 4 Dec 2008 16:04:31 +0000 (17:04 +0100)
committerStephane Glondu <steph@glondu.net>
Thu, 4 Dec 2008 16:04:31 +0000 (17:04 +0100)
commite91ce991bceedc4d0748d967ac41937d14ec6b05
tree283cdcebffdeb19f7bce504223f0afae1eca838b
parentb539cc71229bfc600005c621eb37c6a6e211fd77
parentd7ffe3cdc258d8660027f93000a6b9ce438af5fd
Merge commit 'upstream/3.11.0' into 3.11/master